Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 31 May 2011 05:15:34 +0000 (22:15 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 31 May 2011 05:15:34 +0000 (22:15 -0700)
commit5de85475989bd676e2c3dd0c36ad5822e7cc497d
tree87d2e177d95faa3b0a40beec9b67b4336deda673
parent6a3b7453827b1f50c3629c62880798a01d673720
parent7120646cebfee52182e482b6615231293112da78
Merge from trunk.
src/ChangeLog
src/alloc.c
src/lisp.h